From: Colin Walters <walters@verbum.org>
Date: Mon, 16 Jul 2018 18:43:17 +0000 (-0400)
Subject: build-sys: Link with gpg-error directly
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~4^2~21^2~5
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=be8bbc5f877109be0de43388b401b402d8e4bfb9;p=ostree.git

build-sys: Link with gpg-error directly

We use the API, and not linking breaks the build with e.g.
`-fuse-ld=gold` in a Fedora 28 buildroot as gold doesn't do the
"search indirect dependencies" thing.

Closes: #1679
Approved by: jlebon
---

diff --git a/configure.ac b/configure.ac
index 896e7806..f0907a15 100644
--- a/configure.ac
+++ b/configure.ac
@@ -220,6 +220,10 @@ AS_IF([ test x$have_gpgme = xno ], [
    AC_MSG_ERROR([Need GPGME_PTHREAD version $LIBGPGME_DEPENDENCY or later])
 ])
 OSTREE_FEATURES="$OSTREE_FEATURES gpgme"
+dnl This apparently doesn't ship a pkg-config file either, and we need
+dnl to link to it directly.
+OT_DEP_GPGME_CFLAGS="${OT_DEP_GPGME_CFLAGS} $(gpg-error-config --cflags)"
+OT_DEP_GPGME_LIBS="${OT_DEP_GPGME_LIBS} $(gpg-error-config --libs)"
 
 LIBARCHIVE_DEPENDENCY="libarchive >= 2.8.0"
 # What's in RHEL7.2.